Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 15 Jun 2010 11:40:23 +0000 (11:40 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 15 Jun 2010 11:40:23 +0000 (11:40 +0000)
commit9cb94be6802bc36e323ffc788877513e99fb7dc1
tree6ce3de3cc42efafc03edeb5cb6e1f4054330edc0
parent6ba8cede1e651753999516f4f583fa8b90923161
parentbcaa5b69ae184d04bd5a2b06525365bb5b412fca
Merge from mainline.